manifests/9.2: Use RHEL 9.2 repos & cleanups #1204
Conversation
We already have to use coreos-installer from the RHAOS repo and it's likely that we will have to do it again in the future for 4.14. Remove this to avoid having to make a PR for each package. This reverts commit 49f9824.
Unfortuantely, we're not yet ready to move to the new containers/toolbox workflow. We'll attempt that for a future release. See: https://issues.redhat.com/browse/OCPBUGS-8009 Partially reverts: openshift@65776fa
|
/skip |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
openshift-ci
bot
added
the
approved
travier
changed the title
Since we don't have a legacy toolbox build in OCP channels yet.
With this things build for me.
|
OK I pushed two additional commits here. |
| s=/usr/lib/dracut/modules.d/95nvmf/nvmf-autoconnect.sh | ||
| if test -f "$s"; then | ||
| chmod a+x "$s" | ||
| fi |
There was a problem hiding this comment.
We can remove workaround for nvmf-autoconnect.sh, as the issue does not exist on 9.2
[cloud-user@citest-1 ~]$ rpm -q dracut
dracut-057-21.git20230214.el9.x86_64
[cloud-user@citest-1 ~]$ ll /usr/lib/dracut/modules.d/95nvmf/nvmf-autoconnect.sh
-rwxr-xr-x. 1 root root 140 Jun 19 2022 /usr/lib/dracut/modules.d/95nvmf/nvmf-autoconnect.sh
[cloud-user@citest-1 ~]$ cat /etc/os-release
...
REDHAT_SUPPORT_PRODUCT_VERSION="9.2 Beta"
There was a problem hiding this comment.
Hmm yes...though this is in the FCOS config, so fixing that would require a cycle there...let's just keep this on our list of things to clean up later.
We should be using 4.14 in a few more places here.
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
| @@ -20,7 +20,8 @@ repos: | |||
| - rhel-9.2-baseos | |||
| - rhel-9.2-appstream | |||
| - rhel-9.2-fast-datapath | |||
| - rhel-9.2-server-ose-4.13 | |||
| - rhel-9.2-server-ose-4.13 # FIXME a few things are built only in 4.13 right now, like podman | |||
There was a problem hiding this comment.
Do we have a tracker for this we could paste here?
cgwalters
force-pushed
the
9.2-beta
branch
2 times, most recently
from
5e590b7 to
4a1799e
Compare
|
/override ci/prow/rhcos-92-build-test-metal |
|
@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/rhcos-92-build-test-metal, ci/prow/rhcos-92-build-test-qemu In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
@travier: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: c4rt0, jlebon, travier The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
| @@ -53,7 +53,6 @@ extensions: | |||
| architectures: | |||
| - x86_64 | |||
| repos: | |||
| # - rhel-9.0-appstream | |||
| - sig-virtualization | |||
| - rhel-9.2-appstream | |||
There was a problem hiding this comment.
I couldn't find kata-containers in the rhel-9.2-appstream repo
There was a problem hiding this comment.
Yeah, no kata-containers in rhel, only c9s.
There was a problem hiding this comment.
C9S is RHEL (9). Having a SIG doesn't mean it's "in C9S", only associated with it.
There was a problem hiding this comment.
Sorry, I meant C9S SIG, you are right.
There was a problem hiding this comment.
|
Argh. FTR I accidentally force-pushed over the original PR branch here. I don't think this matters now that it's merged, but just for historical reference. |
Revert "manifest/9.2: Ensure package come from RHEL by default"
We already have to use coreos-installer from the RHAOS repo and it's
likely that we will have to do it again in the future for 4.14.
Remove this to avoid having to make a PR for each package.
This reverts commit 49f9824.
manifest/9.2: Keep legacy coreos/toolbox
Unfortuantely, we're not yet ready to move to the new containers/toolbox
workflow. We'll attempt that for a future release.
See: https://issues.redhat.com/browse/OCPBUGS-8009
Partially reverts: 65776fa
manifests: Merge common-el9.yaml into common.yaml
manifests/9.2: Use RHEL 9.2 repos
manifest/c9s: Update for 4.14
manifest/c9s: Disable all repos by default
manifests: Remove RHEL 8 manifests
manifests: Remove RHEL 9.0 manifests
manifest: Back to rhel toolbox
Since we don't have a legacy toolbox build in OCP channels yet.
rhel-9.2: Fix two more references to 9.0
With this things build for me.